More AI Work

Some minor Trap Logic Changes.