Improving performance...

Too many changes to list, really. Pretty much what I've been working on
since the 16th.