Fixed a lot of things
Fixed other things