Lots of changes; simplified configs