re-implemented tick counter, other smoke fixes