only reading from top-level comments, minor bugfixes)