revise OS constants; reorder path cleanup