Wbiesing/cmd line tweaks

@Elmira88