Tidy up executables

Also a small improvement to commander