Fixes: order of vertices, edges + misc fixes