More cleanup and comments
Changed pub.topics to pub.subjects