Aw jeez... one more correction I need to make for Finnic:
 
Finnic
  Baltic (Finnish, Estonian, Karelian)
  Volga (Mari, Mordvin)
 
There may be a third sub-branch of this.
 
Now I'm pretty much satisfied.
  Uralic-Yukaghir
    Finno-Ugric
      Finnic (Finnish, Estonian, Karelian etc.)
      Ugric (Hungarian, Ostyak, Mansi)
      Sámi (or Lappish)