bug reports #644858 #318970 #733930 by nestormata: Fixing several of the...

bug reports #644858 #318970 #733930 by nestormata: Fixing several of the issues contained in the Drupal 6 version, included the admin file name include, also the form not used correctly.