Clean Up and Bug Fixing