Removed null data capability.  Added debug to file.  Some cleanup.