0.6.1, arg fixes and better version detection