minor updates after refs and some issues with Erin so I need to commit
updates to lots of things
merge ae