Various little fixes to the debug side of things
Merge branch 'master' of https://github.com/AndrewRose/Grease