properly quote PATH & update it all around