Bugfixing and helppatch