ENH: better registration / BUG: stray -t