licence, bugfixing, tests