Fix argument prompting behavior & update help