fixed some language towards a final version