Rudimentary autoreblock, fix single-selection handle bug