Bugfixing and parameterwork