More cleanup, adding tags,  and argument help