non-working optional args. Tom + i will try to fix.
merge fix.