Chain add workflow improved; few minor fixes