Tidy up option parsing and update readme