Bug Fixes and Update functionality added