Lip out improved

Also commented out defineEdges()