Fixed some bugs in Argument, mainly regarding the parsing of - statements
Resolved merge conflicts