Options clean up and minor bug fixes
Resolved conflicts with d26ab8ab2f4bce58a82b4be2142e3ab8f5b1bf56