Fixing comments and doc