Fixed some bugs
Del entries work fine