add edition + scratch some bugs