small fixes, added execute on complete