Chalup/visiblity issues

Closes #77