Debugging Code Update

Visibility mods primarily