some other tweaks, in the same vein of passing in only as little information as neces...