some cosmetics & fixes