Fixed issues with comments as well as parens