Final tweaks to the project