Lots of fixes!