loads of fixes and updates