Lots of fixes

Accept me!