Fixed more important things
Test.
Fixed lots of things