fixing up last gizmos