references, spell and text fixing
merge