Update header and comments
Add docs for wait param on atomic block