Microfix: add comments and tags