Final report + minor bug fixes