fix some PEP8 complaints, add todos
adjust to new module name
slight output changes, update resultsfile