a few more bugs squashed