Various changes made