ENH Final touches