Added some extra niceties in cli args