Final (minor) modifications.
