Adjust some build-in functions and add comments