Tweaked, tidied and improved code
 - Various tweaks
 - Fixed non-compiling pingtest, which is hideous
 - Made the world a little better