merge unique bug fix + comments
tests and pep8