Pull stuff from master back to staging

random things in wrong branch.