more comments and docco docs