Fixed More bugs

-Steven