Better comments and attributions