Command line parser & more

Various changes and additions.