added expiration, expiration date on node, some tweaks