RL Edit + other fixes. Not completed