Version 1.0 Fixes

Fixed option name prefix and other items.