Project cleanup
bug fixes