Fixed some bugs in trellis and started playing with making diff results