Implement missing pubsub commands and fix indentation