small changes in RF
clean up in comm