NO STAGING! fixes to match sandbox
Merge pull request #1271 from pennij/working_thurs0502

NO STAGING! fixes to match sandbox