Minor updates and commenting.