Fixed some issues with arg parser, everything using arg parser now