afm-run: improvement and comments