Few minor changes.
r