Improved vertex mapping a little bit.