New parameters and a few bugfixes