OOP fixes, namespace fixes, closure fixes, scope fixes.