fixed enum, scope issues..