Corrections and improvements. Finalized.