fixed settings override, added some stuff