Corrections

TODO : push
Various corrections