further cleanup
Merge branch 'master' of https://github.com/slo424/Comp3980