On definition add, now printing how many times the entry has been defined. Also simplifying the attribution string.