minor tweaks; handing back to Luke