Bug Fixes and Cosmetic updates