changed node names (added duration), some small corrections