port updates on 9/17

clean up lines
Merge pull request #1 from swyman/update-sept-17

port updates on 9/17