Minor changes and commenting.