made some functional changes to the preprocessor
changed objectives
Merge branch 'feature/doc/finalreport' into develop