add Stage and kill some bugs