Updates to VanillaOption.
Updated make files.