Fix gem name; some cleanup