minor fixes in our custom modules and update drupal for the version 7.21