fixed some issues with project 1