Clean Up and Bug Fixes