Minor fixes/cosmeticcs in commandling parsing