Small changes in formulation, moved and removed som comments