Options tweaks.

got default working properly