cleanup PATH, and some other niceties
merging coz IDK why; I wanted to change a commit message, and I guess I messed up.