further notes, bugfixing