a couple more fixes for mjolnir
and more fixes for mjolnir