Minor changes to finish project