Fix a stage bug
Make more stages