Fix timer + fix main figure scopes