ENH: Added Ibarrier + some tweaks