Merge pull request #113 from yenatch/master

.. move more things.
Split magikarp length calcs out