Adding better references to original author and a better history message