Added lots of stuff for debugging...