tweaks to invocation and selftest