More constants added.
A couple of comments added.