fixes

fixes and updates