fixed settings and tokens