Some fixes
Much better arg parser