Typo & bug fixes
Remove unused comm