Added ability to remove, and touched up on what happens under odd circumstances (om.error)