Updated comments and doc