Many changes
Various changes