add more meta data
add code for comments, but have not complete yet