some more vars generalized
Merge pull request #18 from voisardf/generalizationvars

some more vars generalized