Added a few more settings