Mesh improvements, some ugliness though.