new configs
some fixes