Yea this is one of those moments where I give myself an eternal facepalm >_<, didnt do math this year, did it last year, prolly woulda saw this differently then =.=
To answer the second part:
Then I'd say your correct ^.^, current = rate of charge moving
You are wrong about the first part...