update rivets for what I determine as best practice (sorry!)