Heavily updated commenting.