improved bpm handling