Some minor additions and mods.