Fixed each loop vars - for trim.
inc pkg and rebuilt