Update parts where I forgot to re-name the gem, and clean up some other things