squashed some bugs