More fine grained options

Allow users to turn on/off more features via the options file.