correcios bugs - delete - merge Entries, bugs emails