Various small changes - mostly cosmetic