Added more tweacks to trig and added unused odom_cleanw