Tidied up some debug code, added binary