Some minor changes
Some improvements