Add somme comments, move some stuff at the right place