LOTS of fixes :)