fixed some comm stuff