More tweaks, basic visibility should be functional.