Added comm patch
some minor fixes
merge fix