Fix stupidity and add tick counting