Yet again, more level2 fixes
Merge branch 'master' of https://github.comt /olben/MankindsFinestHour