comments, bugfixes