Code Cleanup
Bugs fixes