bugfixes, added stub for unsubscribe