Simplify spectral flux calculations, improve beat tracking