bug fixes for experimentation