Comment 5 for bug 171801

I revisited these files again, and did some more fixes/cleaning related to different bugs/requests.
I submitted them in
  https://bugs.launchpad.net/inkscape/+bug/182794
since that was the starting point...