some more fixes

this appears to make it more stable