More kwarg improvements