further contribution enhancements. fixes #179