rename_session, new_session fixes/todos