Debug utility (crosses and co-ordinates)

And general cleanups