configs changed for simply for testing, and some cleaning