some white space changes, changed handling of normal/overdrive timing, annotations...