Splash changes--primarily figure cleanup