Added looads of corrections
Added last corrections