Re-kerjiggered a bunch of stuff to be smarter and faster.