Fixed a bunch more bugs