a bunch of lingering changes, I'll check these in, what's the worst that could happen