added de-qualifying of variables and functions, aalthough doesn't work properly with more than one period. Need to fix this