included whitelist for known contributors & fixes for edgecases