fixed problems
Cleanup
Cleanup and bug fixes