Project cleanup
Bug fixes