FIXES
More fixes to the project
More fixes to the project