Fixed More Bugs

-Steven