streamlining a few bugs