fixes due to client comments