first round of staging tweaks