Edits from Elsa integrated and adjusted, plus took on Joe's comments here.