Improve PATH
Cleanups and PATH wonkiness