improved handling of node properties

Global and Node specific properties are now merged before being used for
variable substitution