add path property & minor cleanup