added unite settings and some more