Some adjustments, mostly to make it more general.
1 file changed