squashed some more bugs