Added some more settings