ENH+API: fix+cleanup trellis