squashed some bugs.