more parameters available, some changes to postprocessing, refactoring
merge