Fixed bugs that came with communicating
Merge branch 'fixfixfix' into develop