Project 3 fixed with small issues for project 4