Markup fixes
Document shape types
Remove old shape type list