fix visibility and more