Str +, paren fixes, more tests.