Various changes addressed