Comments and some code changes.