rfis and extra range fix