performance improvements galore