speed adjustment, nicer charting, merge of endo3