update wait command, clean waituntil (commit: 0a175b8)
slight improvement to command class format (commit: 0630152)