Minor changes and comments before done.