Comments and a small buxfix on errors.