Fixed 'multiple done call' errors, and a minor typo that nearly ended the world. (end != expect FYI)