Changes to fix some bugs; committed to CVS repository
Local changes for debugging