Bunch of exploratory changes.