Comments, two bug fixes.