Merged drh's fixes new features (xfer, timeline handling, javascript based timeline highlighting) into my branch.