Too many changes to enumerate, really

Accidentally pushed changes to twelve13 repo rather than my own.