various bug-fixes and parameter changes