Fixed a lot of stuff... Stuff still broken