Bug Fixes, Code Clean-up