cost sheet minor change, misc minor fixes
conflict resolved with theirs