updates from forever ago, I think just perf improvements