Better defaulting of parameters.
Update README