checking in lots of old fixes and updates