Various debuging changes..