ENH: multiple tiny fixes
TYPO: trails -> trials
NEWTESTS + CLEANUPS