Point constraints working almost ok, geometry refined