2 Fixes and Additions

by sadikyo