Many smalle changes