Better sources and attributions