Additional parameters and some bugfixes