Some recent updates
Some minor changes