mk4 SOE and Conditional statements fixes