fixed some cosmetics