reorder arguments. decoding is now easier
add two byte cmd decoder