Arpeggio fixed. Several optimizations.

Arpeggio fixed. Several optimizations.