Finally fixed all the stages

blah blah stages and stuff