Update strings + fix random so removal of entry works properly