fixed config stuff and tweaking