Use async and make jslint happy.

Trying to use async when possible and fixed a few outdated comments.

Also, I'm not sure the return on 151/159 is necessary, but I could be wrong.