Fixed a lot more stuff