updated settings and some comments