Big cleanup and adding the checkbox for the encounter simili