minor improvements including composition changes