Adds bug fix for options handling

Do not preset the values as we will not be able to
tell if the option has been set by cmd line or not!
Implements optimize option