various bug fixes, invoker improvement