Added more settings and toggles