Little performance improvements (1.5millions get/sec!)