Some tweaks.
Add comments.