Minor renamings and reorganization.
Changed parameter types.
Trying isVisible (not working).