fixed problems with project1, still not quite working