corrections from pull reqest