Cleanup fan, add new config options