Grab updates

Update things without killing my modifications.