couple of cosmetic improvements