minor updates and a little pep8 cleanup
Merge pull request #1 from JustinSGray/multi-fi

minor updates and a little pep8 cleanup