Luke- settings add event fixes