Bugfix

All kinds of tidying up
what are you using that makes the formatting so weird?  This thing is way off in left field!