Many corrections and changes