Some more minor changes
Some more changes