Improve options, bug fixes