Small updates to add rmax