Turns and Timing

Readjusted timeouts
Add some missing class de/assignments
Still hunting #36