Fixed the comm header issue, cleaned up code regarding comm header