Uncomment streak code, fix streak code, increment after calc