Fixed merge plane, empty faces, added some performance testing