corrections and enhancements