more settings and fixes