various fixes, including parens