small changes after live testing