Add meta-* and comments