some optimizations I'm pushing up