Lots of changes to CCK support.  More work on copying drupal nodes.