finalisation of project, fix bugs, start of rapport, and update javadoc