Minor improvements to the project