comments and documentation update