Some minor changes - global properties and cosmetic changes