add more level geometry

and improved masterFollow