add some missing data

and remove some redundant stuff