Tidied up:
removed all debug crap,
removed commented code (This is what a VCS is for!)
fixed a few obvious stupids (mutable args etc)
compunded a few incrementers
Merge branch 'release/2.6np1'