diff --git a/otree/api.py b/otree/api.py
index db9f84a5d..9552d33a0 100644
--- a/otree/api.py
+++ b/otree/api.py
@@ -1,7 +1,7 @@
 from importlib import import_module as _import_module
 
-from otree.constants import BaseConstants  # noqa
 from otree.models import BaseSubsession, BaseGroup, BasePlayer  # noqa
+from otree.constants import BaseConstants  # noqa
 from otree.views import Page, WaitPage  # noqa
 from otree.common import Currency, currency_range, safe_json  # noqa
 from otree.bots import Bot, Submission, SubmissionMustFail  # noqa
diff --git a/otree/channels/routing.py b/otree/channels/routing.py
index abeac2f8e..fb972f3c6 100644
--- a/otree/channels/routing.py
+++ b/otree/channels/routing.py
@@ -37,5 +37,6 @@
 
 ]
 
+# TODO: perf issue. this takes 0.1-0.5 seconds.
 for extensions_module in get_extensions_modules('routing'):
     channel_routing += getattr(extensions_module, 'channel_routing', [])
diff --git a/otree/checks/__init__.py b/otree/checks/__init__.py
index 568668441..00196dde3 100644
--- a/otree/checks/__init__.py
+++ b/otree/checks/__init__.py
@@ -257,7 +257,9 @@ def files(rules, **kwargs):
     rules.file_exists('views.py')
 
     if os.path.isdir(rules.get_path('templates')):
+
         # check for files in templates, but not in templates/<label>
+
         misplaced_templates = set(glob.glob(
             os.path.join(rules.get_path('templates'), '*.html')
         ))
diff --git a/otree/extensions.py b/otree/extensions.py
index d3a73d3ce..3565266a6 100644
--- a/otree/extensions.py
+++ b/otree/extensions.py
@@ -54,6 +54,7 @@ def get(self, request, *args, **kwargs):
 """
 
 def get_extensions_modules(submodule_name):
+    '''TODO: performance issue. this 'autodiscover' adds to oTree startup time'''
     modules = []
     for app_config in apps.get_app_configs():
         try:
diff --git a/otree/models/__init__.py b/otree/models/__init__.py
index 7cb013407..d0ee3b6b7 100644
--- a/otree/models/__init__.py
+++ b/otree/models/__init__.py
@@ -17,10 +17,12 @@
 # project I wouldn't do it this way, but because oTree is aimed at newcomers
 # who may need more assistance from their IDE, I want to try this approach out.
 # this module is also a form of documentation of the public API.
+
 subsession_module = import_module('otree.models.subsession')
 group_module = import_module('otree.models.group')
 player_module = import_module('otree.models.player')
 
+
 # so that oTree users don't see internal details
 session_module = import_module('otree.models.session')
 participant_module = import_module('otree.models.participant')
diff --git a/otree/models/session.py b/otree/models/session.py
index 509b64d37..95b78f27f 100644
--- a/otree/models/session.py
+++ b/otree/models/session.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
 import logging
 import channels
 import json
-import django.test
 from django.core.urlresolvers import reverse
 
 from otree import constants_internal
@@ -12,14 +12,17 @@
     random_chars_8, random_chars_10, get_admin_secret_code,
     get_app_label_from_name
 )
+
+
 from otree.db import models
 from otree.models_concrete import ParticipantToPlayerLookup, RoomToSession
 from django.template.loader import get_template
 from django.template import TemplateDoesNotExist
 from .varsmixin import ModelWithVars
+
+
 logger = logging.getLogger('otree')
 
-client = django.test.Client()
 
 ADMIN_SECRET_CODE = get_admin_secret_code()
 
@@ -144,6 +147,13 @@ def mturk_worker_url(self):
         ).format(self.mturk_HITGroupId)
 
     def advance_last_place_participants(self):
+        # django.test takes 0.5 sec to import,
+        # if this is done globally then it adds to each startup
+        # it's only used here, and often isn't used at all.
+        # so best to do it only here
+        # it gets cached
+        import django.test
+        client = django.test.Client()
 
         participants = self.get_participants()
 
diff --git a/otree/models/subsession.py b/otree/models/subsession.py
index 567323abf..af8144e08 100644
--- a/otree/models/subsession.py
+++ b/otree/models/subsession.py
@@ -195,6 +195,14 @@ def group_like_round(self, round_number):
 
         self.set_group_matrix(group_matrix)
 
+    def new_group_like_round(self, round_number):
+        '''test this, could work'''
+        matrix = self.in_round(round_number).get_group_matrix()
+        for row in matrix:
+            for col in row:
+                matrix[row][col] = matrix[row][col].id_in_subsession
+        self.set_group_matrix(matrix)
+
     '''
     def group_like_round(self, round_number):
         PlayerClass = self._PlayerClass()
diff --git a/otree/project_template/.gitignore b/otree/project_template/.gitignore
index f58ba56a7..d84c2cd0f 100644
--- a/otree/project_template/.gitignore
+++ b/otree/project_template/.gitignore
@@ -5,4 +5,6 @@ staticfiles
 .idea
 *~
 *.sqlite3
-_coverage_results/
+_coverage_results
+_static_root
+_bots*s
\ No newline at end of file
diff --git a/otree/settings.py b/otree/settings.py
index 793979b1e..165823f24 100644
--- a/otree/settings.py
+++ b/otree/settings.py
@@ -64,10 +64,11 @@ def get_default_settings(initial_settings=None):
             },
             'sentry': {
                 'level': 'WARNING',
-                'class': (
-                    'raven.contrib.django.raven_compat.handlers.'
-                    'SentryHandler'
-                ),
+                'class': 'logging.StreamHandler',
+                #'class': (
+                #    'raven.contrib.django.raven_compat.handlers.'
+                #    'SentryHandler'
+                #),
             },
         },
         'loggers': {
@@ -236,6 +237,7 @@ def augment_settings(settings):
         'idmap',
     ]
 
+
     if settings.get('SENTRY_DSN'):
         settings.setdefault(
             'RAVEN_CONFIG',
@@ -244,7 +246,8 @@ def augment_settings(settings):
                 'processors': ['raven.processors.SanitizePasswordsProcessor'],
             }
         )
-        no_experiment_apps.append('raven.contrib.django.raven_compat')
+        #no_experiment_apps.append('raven.contrib.django.raven_compat')
+
 
     # order is important:
     # otree unregisters User & Group, which are installed by auth.
diff --git a/tests/settings.py b/tests/settings.py
index 1f833a6b8..2b9caf573 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -64,7 +64,7 @@
 
 INSTALLED_APPS = [
     'otree',
-    'raven.contrib.django.raven_compat',
+    #'raven.contrib.django.raven_compat',
     'tests',
 ]