Fixed a bunch more thigns