Add/clarify some documentation + add a missing **kwargs