streamlining some scripts, renaming, etc.