Small functionality additions.