a bunch of enhancements