Minor tweaks, thinking about performance gains