Splash logic - minor reworks.