some cosmetics fixes