trying to make things faster, mostly failing.
meh.
clean up. Looks like most of the speed issues now are just overhead...