Uncommented trap command.
Changed menu object names.