Updated comments and EDoc stuff