Lots of fixes and updates