Various Code improvements to communication level