handle changes to cmd_block
Clean up some routines from refactoring
TODONE