fixes for editing strategy and looping