tweaks + refactoring. Still doesn't sound any better, but I'm actually pretty convinced I need to start emulating the smp core before I'll get anything useful out of the rest of it.