Improved preferences and config options