Some final changes to the project