Minor mods
Some changes...