squashed a few bugs