tweaking op/deop commands for slightly better checking