Added more vertex types. Improved and fixed existing vertices.