Fix the mess I created - #70, #74, #75, #76

So sorry for not being around to fix this up. I intended to remove this
line when making all the updates to visibilities, simple holograms,
etc. but forgot.

So here I am fixing all the confusion I created. Enjoy.