small changes after quick live test