updated help, bugfixes, code-cleanup