Several improvements to the project