Various changes made during last couple of months.