Various fixes to finalise the project