Fixed the -r argument of macrorun, and other minor changes.