cosmetic
more fixes