by Taz: Updated for Drupal 7 with many caching and form fixes. May still have a few bugs
