Fixes #44
Added a new stage, fixed some bugs here and there.