Bug Fixes and update