Near completely fixed listen and subscribe commands