Many large "+ etc spacing fixes, among other things