more QOS cosmetics and general improvements