fix more parentheis edge cases
fix commentstaments, add types