changes during competition:
-timing
-minor fixes