overhaul disable... commands