Fixed a few more bugs. Made more ugh

-Steven