Tidy up
Correct order of patched commands and normal commands
Fix insertList command patch