Allowing first level comments in code, fixing non-conflicting names in global module