merge and clean-up, added inArguments
save activity