some debugging related changes
Minor changes