And a few more features
A few setting changes