[1.2.1] A bunch of enhancements.