various significant performance improvements