Docstrings, comments, clarify some code, typo.
Back out accidentally committed hack of ASYNC.
merge