fixed all but one pylint and pep8.
last pep and lint.  @assefay please review this and act accordingly if needed.