Fix waste calcs. add me,cache,part_me options