Merged over some changes from anet.
Cp
Tweaked some comments, etc..