Added more statistics

Added more statistics again

Added missing fields

fixed errors