squashed a couple more bugs