bunch of enhancements