Documentation of command line parameters + other small changes

Change-Id: I355014afbe2c2a954e559125bd1ec4da56e7f16c