Default and named arguments, and some small improvements