Some minor additions
Some minor additions