Fixed a lot of things (and broke some more)

Now requires only small checks and should be good to go! :-D