fixes and changes to project