tried to clean up the code and set the publisher/subscriber to the right topics