Fix latest params&sigma order fix (fuck). Clean up.