A whole batch of changes

geddit?