settings and other improvements