cosmetics and trivial bug fixes