Fix rest ; other nits