updated goals for v1 and v2+
fixed typo