several small asjustments:) including cosmetic ones