comments, simple bugfixes