[fix] fixed some serious problems with edit mode