Tons of optimizations for caching, bug fixes, etc.