Code corrections for project 2. Final commit of project 2