cleanup, doku, and workaround for customizer hickup