Change of state space.
Fixed ticks counter.
Merge branch 'time_fix' into dev