Added parameter settings to the overview; clean up