Lots of small optimizations and things, nothing should be functionally different.
Only gotten through a few elements, more later.