Project2 fixes applired