Added ensure flags and cleaned up ibeis calls a bit. Much cleaner