Various updates
Various changes II
Hopefully all is OK