Fixing comments and hardcoded tags
Fixing weird scopes