Fix Comm bugs and refactoring code