minor and mostly cosmetic improvements