comments and a minor bug fix