Some minor additions/changes