* The usual amount of miscellaneous code improvements and optimizations
