fixed some scoping rules
fixed some scoping rules
fixed some scoping rules
removed stuff