Changed some debug formatting etc...