Various changes small changes