Cleaning up command system, more.