Fixed a couple of bugs in postprocessing additional and some file cleanup