Some organization, visibility tweaks