bug fixes

more fixes regarding pubsub