Fixes all comment functionality