Various updates
Various changes and updates