Enhanced pub/sub with global message capability along with a little cleanup