Commit2: MVP+code fixes