Add more meta and comments