cleaned up project for necessary bits and fixes all around for a
successful build