File visibility and bug fixing