renamed
Merge in text from jon
clean up refs