Keyword arguments are now listed with default arguments. Also minor rewrites.