Reflect new defaults.
Make use of kwargs for all keywords; reorganized; better defaults