fixed markup and a cross-refs
updated goals for v1 and v2+

moved name, icons, back into V1