Bugfixes
Added second noArg option, tweaked output formatting