Last comments before finishing

almost ready