One bugfix, two comment fixes