Cleanup and Month fix.