Minor cosmetics and 1 bug fix.