Added an erase option to EntityTrap. Add a ! to the beginning of the
last line.
Few improvements to HiddenSwitch.