fixes and stuff (stage?)