Stop closed doors trying to mimic their past selves
Tidy up trap handling