Bunch of minor changes.
Committing now, because starting asset removal.