bug fixes

bug fixes and updates