a few bug fixes & toggle gizmos