point/line/layer changes, and working on linking