more fixes
Merge branch 'sl6' of https://github.com/isobelojalvo/UWAnalysis into sl6