updated settings and comments.