PATH improvements, see issues, #56, #57