speed and strategy fixes