cleanups, meter tweaks