minor changes mostly assigned with logging