http://wolfsbane.alwaysdata.net/Spells.html
That is quite useful database. According to it only water picks count.(that is usually the case for most of the spells only the main path of the spell counts in increasing its power)
not sure about the first question.