settings and minnor changes