CRMT2: more minor form tweaks and pixel pushing