bug fixes
bug fixes and changes