a bunch of fixes and updates