cleanups/fixes to the remainder of dither switches