Layout changes and comments added.