minor fixes related to comments, pep8 et,