More option breakout, tinkering