Split/add and fixes

Why did you switch the order of the conditionals?