Fix accidentally reusing the first branch target for all branches...
Fix some typos