Adding missing add/remove call to the set. Adding also some traces. fixes #34