more scripts & workflow improvement