Add settings and general improvements