Subtle bugfix, a few comments.