Updated output and added more DEBUG information.