Improve options, increment version