Some little fixes on comments and functions