some fixes and erase process