Various changes made.