Changing how traps and mask objects are accessed; finishing up se.correct() function.