Added some (more) settings