Various changes and updates