* Change in comments?
* Some updates after looking at other code.