a few enhancements