fixed /listen bug, cleaned stuff up