Minor changes and deltingsome debug code.