Merging code to dev

Including the text updates from both Dan and Erika