Added parameter tweaking

+ other minor edits