OMG Lots of stuff incl bugfixes!