improve error when a name collision occurs
removing foundry for staging
Tweaks for staging site
Fix rebase
Reverting tweaks