added trailing slashes; removed p1 reference...