various composer enhancements