Lots of updates, optimizations, etc.