Comment fix, scope fix, etc. v1...