Argument fix, and reference fix

All arguments now parsed correctly.

Command and Args now passed correctly.