Adding comments and constants.
amend