Turn on shiftround setting, other clean up