cosmetics and small improvements