More work on summoner db, also some cleanup