Some bug fixes including broad skill jank, plus some reporting stuff