made some basic text updates
merge