streamlining and fixes