Add new comments, fix a bug and pep8