Lots of little fixes and updates