I hope to have fixed the visibility methods - needs to be tested though.
Added some more scopes..