Fix add comments and small fixes