More command-line stuff
Adds default runtime