Improve version and help options