Simplified Drummer somewhat and fixed a bug in determining next beat.