diff --git a/includes/Conversion.inc b/includes/Conversion.inc
index 4a4f340..00050e2 100644
--- a/includes/Conversion.inc
+++ b/includes/Conversion.inc
@@ -81,7 +81,7 @@ class Conversion {
         // rules integration
         if (module_exists('rules') && $video->entity_type == 'node')
           rules_invoke_event('video_failed', node_load($video->entity_id));
-        watchdog('transcoder', 'Video conversion has been failed!. Please check further logs for debugging.', array(), WATCHDOG_WARNING);
+        watchdog('transcoder', 'Video conversion has failed!. Please check logs for further debugging.', array(), WATCHDOG_WARNING);
       }
     }
     else {
diff --git a/includes/Metadata.inc b/includes/Metadata.inc
index d7fc1f1..9af2ae4 100644
--- a/includes/Metadata.inc
+++ b/includes/Metadata.inc
@@ -48,7 +48,7 @@ class Metadata {
       '#type' => 'checkbox',
       '#title' => t('Enable Metadata'),
       '#default_value' => variable_get('video_metadata', FALSE),
-      '#description' => t('Metadata is particularly useful in video, where information about its contents (such as transcripts of conversations and text descriptions of its scenes) are not directly understandable by a computer, but where efficient search is desirable.'),
+      '#description' => t('Metadata is particularly useful in video, where content information (such as conversation transcripts or scene descriptions) are not directly accessible by a computer, but where searchability is desired.'),
     );
     $options = $this->_metadata();
     $form['video_metadata'] = array(
@@ -63,8 +63,8 @@ class Metadata {
     $form = $form + $options['admin_settings'];
     $form['video_metadata_dimensions'] = array(
       '#type' => 'textarea',
-      '#title' => t('Selectable Dimensions when uploading videos'),
-      '#description' => t('Enter one dimension per line as Video Resolutions.  Each resolution must be in the form of WxH where W=Width and H=Height in pixels.  Example dimensions are 1280x720.'),
+      '#title' => t('Available Dimensions for uploaded videos'),
+      '#description' => t('Enter one set of Video Resolution dimensions (for example 1280x720) per line.'),
       '#default_value' => variable_get("video_metadata_dimensions", video_default_dimensions()),
     );
 
diff --git a/includes/Preset.inc b/includes/Preset.inc
index 745b7ee..912af5c 100644
--- a/includes/Preset.inc
+++ b/includes/Preset.inc
@@ -26,8 +26,8 @@ class Preset {
     $presets = video_preset_get_presets();
     if (count($presets) == 0) {
       $form['video_preset'] = array(
-        '#markup' => t('No Preset were found. Please use the !create_link link to create
-      a new Video Preset, or upload an existing Feature to your modules directory.', array('!create_link' => l(t('Create Video Preset'), 'admin/config/media/video/presets/add'))),
+        '#markup' => t('No Presets were found. Please use the !create_link link to create
+          a new Video Preset, or upload an existing Feature to your modules directory.', array('!create_link' => l(t('Create Video Preset'), 'admin/config/media/video/presets/add'))),
         '#prefix' => '<div id="preset-checkboxes">',
         '#suffix' => '</div>',
       );
@@ -42,16 +42,16 @@ class Preset {
       '#type' => 'checkbox',
       '#title' => t('Use preset WxH for video conversion.'),
       '#default_value' => variable_get('video_use_preset_wxh', FALSE),
-      '#description' => t('Override the user selected WxH with the preset values. This is recommend.')
+      '#description' => t('Override the user selected WxH with the preset values (Recommended).')
     );
     $form['video_preset'] = array(
       '#type' => 'checkboxes',
       '#title' => t('Video transcode presets'),
       '#options' => $preset,
       '#default_value' => variable_get('video_preset', array('FLV')),
-      '#description' => t('Please use the !manage_link link to manage
+      '#description' => t('Use the !manage_link link to manage
        Video Presets. Use the !create_link link to create
-      a new Video Preset, or upload an existing Feature to your modules directory.', array('!manage_link' => l(t('Manage Video Preset'), 'admin/config/media/video/presets'),
+       a new Video Preset, or upload an existing Feature to your modules directory.', array('!manage_link' => l(t('Manage Video Preset'), 'admin/config/media/video/presets'),
         '!create_link' => l(t('Create Video Preset'), 'admin/config/media/video/presets/add'))),
       '#prefix' => '<div id="preset-checkboxes">',
       '#suffix' => '</div>',
diff --git a/includes/Transcoder.inc b/includes/Transcoder.inc
index 802211d..48872e7 100644
--- a/includes/Transcoder.inc
+++ b/includes/Transcoder.inc
@@ -10,7 +10,7 @@ class Transcoder {
 
   /**
    * Extract frames from the video file. This helper function will intract with
-   * only the database and it will save all the thumbanil file reference in to
+   * only the database and it will save all the thumbnail file reference in to
    * the database.
    * @param type $video
    * @return type 
@@ -22,9 +22,9 @@ class Transcoder {
     $factory = new TranscoderAbstractionAbstractFactory();
     $transcoder = $factory->getProduct();
     $transcoder->setInput($video);
-    $thumbanils = $transcoder->extractFrames();
-    if (!empty($thumbanils)) {
-      foreach ($thumbanils as $file) {
+    $thumbnails = $transcoder->extractFrames();
+    if (!empty($thumbnails)) {
+      foreach ($thumbnails as $file) {
         // if media module exists add type as an image
         if (module_exists('media'))
           $file->type = 'image';
diff --git a/includes/TranscoderFactory.inc b/includes/TranscoderFactory.inc
index 4216764..c2f769c 100644
--- a/includes/TranscoderFactory.inc
+++ b/includes/TranscoderFactory.inc
@@ -147,7 +147,7 @@ abstract class TranscoderAbstractionFactory {
   /**
    * Get file informations
    * @return $file associative array with file informations
-   * like duration, dimentions
+   * like duration, dimensions
    */
   public function getFileInfo() {
     $file = array();
diff --git a/metadata/flvtool2.inc b/metadata/flvtool2.inc
index 8687c53..f9f8456 100644
--- a/metadata/flvtool2.inc
+++ b/metadata/flvtool2.inc
@@ -32,7 +32,7 @@ class flvtool2 implements metadata_interface {
    * @see sites/all/modules/video/includes/metadata_interface#get_help()
    */
   public function getHelp() {
-    return t('!flvtools calculates various meta data and inserts a onMetaData tag in the video. It cuts FLV files and adds cue Points (onCuePoint). A debug command shows the inside of a FLV file and the print command gives meta data information in XML or YAML format.', array('!flvtools' => l(t('FlvTools2 '), 'http://github.com/unnu/flvtool2')));
+    return t('!flvtools calculates metadata and inserts an onMetaData tag in the video. It cuts FLV files and adds cue Points (onCuePoint). A debug command shows the inside of a FLV file and the print command gives meta data information in XML or YAML format.', array('!flvtools' => l(t('FlvTools2 '), 'http://github.com/unnu/flvtool2')));
   }
 
   public function runCommand($options) {
diff --git a/modules/video_ui/video.admin.inc b/modules/video_ui/video.admin.inc
index 715f833..22a85b0 100644
--- a/modules/video_ui/video.admin.inc
+++ b/modules/video_ui/video.admin.inc
@@ -81,8 +81,8 @@ function video_general_admin_settings() {
     '#type' => 'checkbox',
     '#title' => t('Publish when conversion complete'),
     '#default_value' => variable_get('video_publish_on_complete', FALSE),
-    '#description' => t('Now this feature is fully controlled by !rules module. Download 
-      the module and configure your rules to effect when the video conversions has been completed and failed.', array('!rules' => l('Rules', 'http://drupal.org/project/rules'))),
+    '#description' => t('This feature is now fully controlled by !rules module. Download 
+      the module and configure rules to take effect when video conversions have completed or failed.', array('!rules' => l('Rules', 'http://drupal.org/project/rules'))),
     '#disabled' => TRUE
   );
   return system_settings_form($form);
@@ -174,21 +174,21 @@ function video_cron_admin_settings() {
   $form = array();
   $form['video_cron'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Use Drupals built in cron.'),
+    '#title' => t('Use Drupal\'s built-in cron.'),
     '#default_value' => variable_get('video_cron', TRUE),
-    '#description' => t('If you would like to use Drupals built in cron hook, check this box.  Please be warned that transcoding videos is very resource intensive.  If you use poor mans cron, I highly discourage this option.  I also suggest you setup your cron to call this function through CLI instead of WGET.'),
+    '#description' => t('Check this box to use Drupal\'s built in cron hook. Be aware that video transcoding is very resource-intensive. If you use poor man\'s cron, this option is strongly discouraged. We suggest you set up your cron to call this function through CLI instead of WGET.'),
   );
   $form['video_queue_timeout'] = array(
     '#type' => 'textfield',
     '#title' => t('Video queue timeout (s).'),
     '#default_value' => variable_get('video_queue_timeout', 90),
-    '#description' => t('The maximum time allow a video to complete their transcoding. Put a larger value for larger size video.'),
+    '#description' => t('The maximum time allowed for a video transcode to complete. Use a larger value for larger-sized video.'),
   );
   $form['video_ffmpeg_instances'] = array(
     '#type' => 'textfield',
     '#title' => t('Total videos to convert during each cron process.'),
     '#default_value' => variable_get('video_ffmpeg_instances', 5),
-    '#description' => t('How many videos do you want to process on each cron run?  Either through hook_cron or the video_scheduler.php.'),
+    '#description' => t('How many videos do you want to process on each cron run?  Either through hook_cron or video_scheduler.php.'),
   );
   return system_settings_form($form);
 }
\ No newline at end of file
diff --git a/modules/video_ui/video.preset.inc b/modules/video_ui/video.preset.inc
index c0ca0be..36e945c 100644
--- a/modules/video_ui/video.preset.inc
+++ b/modules/video_ui/video.preset.inc
@@ -104,7 +104,7 @@ function video_preset_default_form($form, &$form_state, $preset) {
   $form['settings']['video']['wxh'] = array(
     '#type' => 'select',
     '#title' => t('Dimensions'),
-    '#description' => t('Select the desired widthxheight of the video player. You can add your own dimention from !settings.', array('!settings' => l('video metadata settings', 'admin/config/media/video/metadata'))),
+    '#description' => t('Select the desired widthxheight of the video player. You can add your own dimensions from !settings.', array('!settings' => l('video metadata settings', 'admin/config/media/video/metadata'))),
     '#default_value' => !empty($preset['settings']['wxh']) ? $preset['settings']['wxh'] : '640x480',
     '#options' => video_explode("\n", variable_get("video_metadata_dimensions", video_default_dimensions()))
   );
@@ -187,7 +187,7 @@ function video_preset_default_form($form, &$form_state, $preset) {
   $form['settings']['adv_video']['keyframe_interval'] = array(
     '#type' => 'textfield',
     '#title' => t('Key frame interval'),
-    '#description' => t('By default, a keyframe will be created at most every 250 frames. Specifying a different keyframe interval will allow you to create more or less keyframes in your video. A greater number of keyframes will increase the size of your output file, but will allow for more precise scrubbing in most players. Keyframe interval should be specified as a positive integer. For example, a value of 100 will create a keyframe every 100 frames.'),
+    '#description' => t('By default, a keyframe will be created at most every 250 frames. Specifying a different keyframe interval will allow you to create more or fewer keyframes in your video. A greater number of keyframes will increase the size of your output file, but will allow for more precise scrubbing in most players. Keyframe interval should be specified as a positive integer. For example, a value of 100 will create a keyframe every 100 frames.'),
     '#default_value' => !empty($preset['settings']['keyframe_interval']) ? $preset['settings']['keyframe_interval'] : ''
   );
   $form['settings']['adv_video']['video_bitrate'] = array(
@@ -329,7 +329,7 @@ function video_preset_default_form($form, &$form_state, $preset) {
   $form['settings']['vid_optimization']['denoise'] = array(
     '#type' => 'select',
     '#title' => t('Denoise'),
-    '#description' => t('Apply denoise filter. Generally results in slightly better compression, and slightly slower encoding. Beware of any value higher than "Weak" (unless you\'re encoding animation).'),
+    '#description' => t('Apply denoise filter. Generally results in slightly better compression and slightly slower encoding. Beware of any value higher than "Weak" (unless you\'re encoding animation).'),
     '#options' => array(
       0 => 'None',
       'weak' => 'Weak - usually OK for general use',
@@ -386,7 +386,7 @@ function video_presets_overview() {
     return theme('table', array('header' => $header, 'rows' => $rows));
   }
   else {
-    return t('No Preset were found. Please use the !create_link link to create
+    return t('No Presets were found. Please use the !create_link link to create
       a new video preset, or upload an existing Feature to your modules directory.', array('!create_link' => l(t('Create Video Preset'), 'admin/config/media/video/presets/add')));
   }
 }
@@ -422,7 +422,7 @@ function video_preset_form($form, &$form_state, $preset = FALSE) {
     '#type' => 'textfield',
     '#title' => t('Preset name'),
     '#maxlength' => VIDEO_PRESET_MAX_LENGTH,
-    '#description' => t('Spaces are NOT allowed; punctuation is not allowed except for periods, hyphens, apostrophes, and underscores.'),
+    '#description' => t('Spaces are NOT allowed. The only permitted punctuation is period, hyphen, apostrophe, and underscore.'),
     '#required' => TRUE,
     '#weight' => -10,
     '#element_validate' => array('_video_preset_name_validate'),
diff --git a/transcoders/TranscoderAbstractionFactoryFfmpeg.inc b/transcoders/TranscoderAbstractionFactoryFfmpeg.inc
index 4260c82..451caee 100644
--- a/transcoders/TranscoderAbstractionFactoryFfmpeg.inc
+++ b/transcoders/TranscoderAbstractionFactoryFfmpeg.inc
@@ -379,7 +379,7 @@ class TranscoderAbstractionFactoryFfmpeg extends TranscoderAbstractionFactory im
     $form['ffmpeg']['thumbnail']['video_thumbnail_path'] = array(
       '#type' => 'textfield',
       '#title' => t('Path to save thumbnails'),
-      '#description' => t('Path to save video thumbnails extracted from the videos.'),
+      '#description' => t('Path to save video thumbnails extracted from videos.'),
       '#default_value' => variable_get('video_thumbnail_path', 'videos/thumbnails'),
     );
     $form['ffmpeg']['thumbnail']['video_thumbnail_count'] = array(
@@ -391,7 +391,7 @@ class TranscoderAbstractionFactoryFfmpeg extends TranscoderAbstractionFactory im
     $form['ffmpeg']['thumbnail']['video_thumb_save_all'] = array(
       '#type' => 'checkbox',
       '#title' => t('Save all thumbnails in {file_manged} table'),
-      '#description' => t('Save all auto created thumbnails to the {file_managed} table. Change file status as PERMANENT'),
+      '#description' => t('Save all auto-created thumbnails to the {file_managed} table. Change file status as PERMANENT'),
       '#default_value' => variable_get('video_thumb_save_all', FALSE),
     );
     $form['video_ffmpeg_end'] = array(
diff --git a/transcoders/TranscoderAbstractionFactoryZencoder.inc b/transcoders/TranscoderAbstractionFactoryZencoder.inc
index 0df72ed..f187e54 100644
--- a/transcoders/TranscoderAbstractionFactoryZencoder.inc
+++ b/transcoders/TranscoderAbstractionFactoryZencoder.inc
@@ -208,7 +208,7 @@ class TranscoderAbstractionFactoryZencoder extends TranscoderAbstractionFactory
 //        '#title' => t('Password'),
 //        '#default_value' => variable_get('zencoder_password', ''),
 //        '#size' => 50,
-//        '#description' => t('Make sure the password is protect in somewhere, since it will need to login back to the Zencoder website.')
+//        '#description' => t('Keep this password somewhere safe, since it will be needed to log in to the Zencoder website.')
 //      );
       $form['zencoder_user']['agree_terms_zencoder'] = array(
         '#type' => 'checkbox',
@@ -239,31 +239,31 @@ class TranscoderAbstractionFactoryZencoder extends TranscoderAbstractionFactory
       );
       $form['zencoder_info']['video_thumbnail_size'] = array(
         '#type' => 'select',
-        '#title' => t('Dimention of thumbnails'),
+        '#title' => t('Dimension of thumbnails'),
         '#default_value' => variable_get('video_thumbnail_size', '320x240'),
         '#options' => video_explode("\n", variable_get("video_metadata_dimensions", video_default_dimensions()))
       );
       $form['zencoder_info']['video_zencoder_postback'] = array(
         '#type' => 'textfield',
         '#title' => t('Postback URL for Zencoder'),
-        '#description' => t('Important : Do not change this if you do not know
-          what your doing. This postback URL will receive video data when they are completed transcoding.'),
+        '#description' => t('Important : Don\'t change this if you don\'t know
+          what you\'re doing. This postback URL will receive video data as video transcodings are completed.'),
         '#default_value' => variable_get('video_zencoder_postback', $base_url . '/postback/jobs'),
       );
       $form['zencoder_info']['video_zencoder_base_url'] = array(
         '#type' => 'textfield',
         '#title' => t('Output file base'),
         '#description' => t('A base S3, Cloud Files, FTP, FTPS, or SFTP directory 
-          URL where we\'ll put the transcoded file. If your using ftp://, sftp:// 
-          or similar then you have to <b>mount sites/default/files folder to FTP base folder</b> before 
-          create videos.<br/> You can use <em>mount</em> command (mount --bind /source_dir /dest_dir_01):
+          URL where we\'ll put the transcoded file. If you\'re using ftp://, sftp://, etc.
+          then you must <b>mount sites/default/files folder as the FTP base folder</b> before
+          creating videos.<br/> You can use the <em>mount</em> command (mount --bind /source_dir /dest_dir_01):
           <br/> Eg : <br/><code>1. mkdir /home/USERNAME/videos</code><br/>
           <code>2. mount --bind /var/www/html/DRUPAL/sites/default/files/videos/ /home/USERNAME/files/videos</code><br/>
           <code>3. cd /home/USERNAME/videos</code><br/>
           <code>4. ls -l</code><br/>
           <code><b>It should display </b><br/>converted<br/>original<br/>thumbnails</code><br/>
           <code>5. chown -R USERNAME:USERNAME videos/</code>
-          <br/><br/>Example URL patterens: <code>s3://my-output-bucket, cf://username:api_key@container/, 
+          <br/><br/>Example URL patterns: <code>s3://my-output-bucket, cf://username:api_key@container/, 
           ftp://user:password@ftp.example.com</code>', array('!more' => l('More info', 'https://app.zencoder.com/docs/api/encoding/general-output-settings/base-url'))),
         '#default_value' => variable_get('video_zencoder_base_url', 'ftp://[user]:[password]@[ftp.url]'),
       );
@@ -271,7 +271,7 @@ class TranscoderAbstractionFactoryZencoder extends TranscoderAbstractionFactory
         '#type' => 'checkbox',
         '#title' => t('Use full path'),
         '#default_value' => variable_get('video_zencoder_use_full_path', FALSE),
-        '#description' => t('If enabled the full dir path to the file will show up in the filepath of the outputfile.<br/><b>Disable</b> this to reduse the security fall. We don\'t encourage to enble this.')
+        '#description' => t('If enabled the full dir path to the file will show up in the filepath of the outputfile.<br/><b>Disable</b> this to reduce the security risk. We discourage enabling this option.')
       );
       // testing
       $form['zencoder_info']['testing'] = array(
@@ -284,14 +284,14 @@ class TranscoderAbstractionFactoryZencoder extends TranscoderAbstractionFactory
         '#type' => 'checkbox',
         '#title' => t('Test mode'),
         '#default_value' => variable_get('video_zencoder_testing_mode', FALSE),
-        '#description' => t('Enable test mode to test upload/playback locally(If you do not have any public IP to test)')
+        '#description' => t('Enable test mode to test upload/playback locally (if you have no public IP to test)')
       );
       $form['zencoder_info']['testing']['video_zencoder_test_file_path'] = array(
         '#type' => 'textfield',
         '#title' => t('Path to test video file'),
-        '#description' => t('Add a file path to a video file to download by Zencoder 
-          to trnascode, you have to mention this file for testing if your using your 
-          locabox and there is no any public ip where Zencoder can download video.'),
+        '#description' => t('Add the path to a video file for Zencoder to transcode.
+          You must use this file for testing when using a local machine with no public IP
+          address from which Zencoder can download video.'),
         '#default_value' => variable_get('video_zencoder_test_file_path', 'http://example.com/video.mp4'),
       );
     }
diff --git a/video.field.inc b/video.field.inc
index 10f3806..1a2395f 100644
--- a/video.field.inc
+++ b/video.field.inc
@@ -12,7 +12,7 @@ function video_field_info() {
   return array(
     'video' => array(
       'label' => t('Video'),
-      'description' => t('This field stores the ID of an video file as an integer value.'),
+      'description' => t('This field stores the ID of a video file as an integer value.'),
       'settings' => array(
         'uri_scheme' => variable_get('file_default_scheme', 'public'),
         'autoconversion' => 0,
@@ -218,7 +218,7 @@ function _video_field_file_autoconversion($entity_type, $entity, $field, $instan
         // set to false when convert on save
         $job = FALSE;
         if ($video_conversion->process($item['fid'])) {
-          drupal_set_message(t('Transcoding job submission was successful. Your video will convert and publish very soon.'));
+          drupal_set_message(t('Transcoding job submission was successful. Your video will be converted and published very soon.'));
         }
         else {
           $video = $transcoder->loadJob();
@@ -420,7 +420,7 @@ function video_field_formatter_settings_form($field, $instance, $view_mode, $for
       '#title' => t('Dimensions'),
       '#type' => 'select',
       '#default_value' => $settings['widthxheight'],
-      '#description' => t('Select the desired widthxheight of the video player. You can add your own dimention from !settings.', array('!settings' => l('video metadata settings', 'admin/config/media/video/metadata'))),
+      '#description' => t('Select the desired widthxheight of the video player. You can add your own dimensions from !settings.', array('!settings' => l('video metadata settings', 'admin/config/media/video/metadata'))),
       '#options' => video_explode("\n", variable_get("video_metadata_dimensions", video_default_dimensions()))
     );
   }
diff --git a/video.install b/video.install
index 7f93a5b..436388f 100644
--- a/video.install
+++ b/video.install
@@ -155,7 +155,7 @@ function video_schema() {
   );
   // video converted file reference
   $schema['video_output'] = array(
-    'description' => 'Track file id for conveted files.',
+    'description' => 'Track file id for converted files.',
     'fields' => array(
       'vid' => array(
         'description' => 'Video ID.',
@@ -202,7 +202,7 @@ function video_field_schema($field) {
         'unsigned' => TRUE,
       ),
       'thumbnail' => array(
-        'description' => 'The {file_managed}.fid being referenced for video thumbanil.',
+        'description' => 'The {file_managed}.fid being referenced for video thumbnail.',
         'type' => 'int',
         'not null' => FALSE,
         'unsigned' => TRUE,
diff --git a/video.module b/video.module
index db79f7b..030122b 100644
--- a/video.module
+++ b/video.module
@@ -69,12 +69,12 @@ function video_permission() {
       'description' => t('Warning: Give to trusted roles only; this permission has security implications.'),
     ),
     'override player dimensions' => array(
-      'title' => t('Change default player dimentions'),
+      'title' => t('Change default player dimensions'),
       'description' => t('Warning: Give to trusted roles only; this permission has usability implications.'),
     ),
     'use default thumb' => array(
       'title' => t('Use default thumbnail'),
-      'description' => t('Use default video thumbnail as video thumbnail of the video.'),
+      'description' => t('Use the default video thumbnail as the thumbnail for the video.'),
     ),
     're convert video' => array(
       'title' => t('Re queue video'),
@@ -86,7 +86,7 @@ function video_permission() {
     ),
     'transocder postback' => array(
       'title' => t('Transcoder postback path access'),
-      'description' => t('This should enable for anonymous users. Transcoder will send details about transcoding jobs in to this url.'),
+      'description' => t('This URL should be accessible to anonymous users. Transcoder will send details about transcoding jobs to this url.'),
     ),
   );
   return $perms;
@@ -243,21 +243,21 @@ function video_file_download($uri) {
   $path = file_uri_target($uri);
 
   // Looks like we have a transcoded file
-	if(strpos($uri, '/converted/') !== FALSE){
-		// Get the original FID and URI using the video_output table
-		$video_fids = db_query('SELECT file_managed.fid output_fid, original_fid, file_original.uri original_uri FROM {file_managed} JOIN {video_output} ON file_managed.fid = video_output.output_fid JOIN {file_managed} file_original ON file_original.fid = video_output.original_fid WHERE file_managed.uri = :uri', array(':uri' => $uri))->fetchObject();
+	if (strpos($uri, '/converted/') !== FALSE){
+      // Get the original FID and URI using the video_output table
+      $video_fids = db_query('SELECT file_managed.fid output_fid, original_fid, file_original.uri original_uri FROM {file_managed} JOIN {video_output} ON file_managed.fid = video_output.output_fid JOIN {file_managed} file_original ON file_original.fid = video_output.original_fid WHERE file_managed.uri = :uri', array(':uri' => $uri))->fetchObject();
 
-		// Check permissions of original file to grant access to the converted file
-		$original_file_headers = module_invoke_all('file_download', $video_fids->original_uri);
-    if(in_array(-1, $original_file_headers)) {
-      return drupal_access_denied();
-    }
-    // Get the headers of the converted file and return them if they are valid
-    $file = file_load($video_fids->output_fid);
-    $headers = file_get_content_headers($file);
-    if(!in_array(-1, $headers)) {
-      return $headers;
-    }
+      // Check permissions of original file to grant access to the converted file
+      $original_file_headers = module_invoke_all('file_download', $video_fids->original_uri);
+      if (in_array(-1, $original_file_headers)) {
+        return drupal_access_denied();
+      }
+      // Get the headers of the converted file and return them if they are valid
+      $file = file_load($video_fids->output_fid);
+      $headers = file_get_content_headers($file);
+      if(!in_array(-1, $headers)) {
+        return $headers;
+      }
 	}
 
   // Private file access for image style derivatives.
@@ -359,7 +359,7 @@ function video_file_browser() {
     '#title' => t('Player Dimensions'),
     '#type' => 'select',
     '#default_value' => '352x288',
-    '#description' => t('Select the desired widthxheight of the video player. You can add your own dimention from !settings.', array('!settings' => l('video metadata settings', 'admin/config/media/video/metadata'))),
+    '#description' => t('Select the desired widthxheight of the video player. You can add your own dimensions from !settings.', array('!settings' => l('video metadata settings', 'admin/config/media/video/metadata'))),
     '#options' => video_explode("\n", variable_get("video_metadata_dimensions", video_default_dimensions())),
     '#attributes' => array('class' => array('video-file-browser-dimensions'))
   );
diff --git a/video.rules.inc b/video.rules.inc
index 9101407..354236a 100644
--- a/video.rules.inc
+++ b/video.rules.inc
@@ -25,16 +25,16 @@ function video_rules_event_info() {
   );
   return array(
     'video_success' => $defaults + array(
-  'label' => t('After video conversion success'),
-  'variables' => array(
-    'node' => array('type' => 'node', 'label' => t('video success')),
-  ),
+      'label' => t('After video conversion success'),
+      'variables' => array(
+        'node' => array('type' => 'node', 'label' => t('video success')),
+      ),
     ),
     'video_failed' => $defaults + array(
-  'label' => t('After video conversion failed.'),
-  'variables' => array(
-    'node' => array('type' => 'node', 'label' => t('video failed')),
-  ),
+      'label' => t('After video conversion failed.'),
+      'variables' => array(
+        'node' => array('type' => 'node', 'label' => t('video failed')),
+      ),
     ),
   );
   return $items;
diff --git a/video.theme.inc b/video.theme.inc
index be7bb3b..7fdaf42 100644
--- a/video.theme.inc
+++ b/video.theme.inc
@@ -60,7 +60,7 @@ function theme_video_formatter_player($variables) {
   module_load_include('inc', 'video', '/includes/VideoHelper');
   $video_helper = new VideoHelper;
   $video = $video_helper->video_object($variables);
-  // override player dimentions
+  // override player dimensions
   if (isset($variables['player_dimensions']) && !empty($variables['player_dimensions'])) {
     $player_dimensions = explode('x', $variables['player_dimensions']);
     $video->player_width = trim($player_dimensions[0]);
@@ -175,7 +175,7 @@ function theme_video_inprogress() {
  * Display an "encoding failed" message"
  */
 function theme_video_conversion_failed() {
-  return '<div class="video-conversion-failed">' . t('The video conversion process has failed. You might want to submit a simpler video format like <em>mpeg</em> or <em>divx avi</em>.<br />If the problem persists please contact website administrators. Please check logs for further debugging.') . '</div>';
+  return '<div class="video-conversion-failed">' . t('The video conversion process has failed. You might want to submit a simpler video format like <em>mpeg</em> or <em>divx avi</em>.<br />If the problem persists contact your website administrator. Please check logs for further debugging.') . '</div>';
 }
 
 /*
@@ -231,7 +231,7 @@ function theme_video_flv($variables) {
       return theme('jwplayer', array('item' => $item, 'player_id' => 'jwplayer', 'attributes' => $attributes));
       break;
     default:
-      $themed_output = t('No flash player has been setup. ' . l(t('Please select a player to play Flash videos.'), 'admin/config/media/video/players'));
+      $themed_output = t('No flash player has been set up. ' . l(t('Please select a player to play Flash videos.'), 'admin/config/media/video/players'));
       break;
   }
   return theme('video_play_flv', array('video' => $video, 'themed_output' => $themed_output));
diff --git a/video.utility.inc b/video.utility.inc
index 7c5e7ca..c9f90cc 100644
--- a/video.utility.inc
+++ b/video.utility.inc
@@ -166,7 +166,7 @@ function video_widget_element_settings(&$element, &$form_state) {
       $element['re_convert_video'] = array(
         '#type' => 'checkbox',
         '#title' => t('Video conversion has been <b>' . $status[$video->video_status] . '!</b>. Re-queue video?.'),
-        '#description' => t('This will re-convert your video to output formats when you save, or scheduling it for cron.'),
+        '#description' => t('This will re-convert your video to output formats when you save, or schedule it for cron.'),
         '#attributes' => array('class' => array('video-re-convert', 'video-' . $video->video_status)),
       );
     }
@@ -175,7 +175,7 @@ function video_widget_element_settings(&$element, &$form_state) {
         '#type' => 'checkbox',
         '#title' => t('Bypass auto conversion'),
         '#default_value' => isset($file['bypass_autoconversion']) ? $file['bypass_autoconversion'] : variable_get('video_bypass_conversion', FALSE),
-        '#description' => t('This will bypass your auto conversion of videos.'),
+        '#description' => t('This will bypass the auto-conversion of videos.'),
         '#attributes' => array('class' => array('video-bypass-auto-conversion')),
       );
     }
@@ -210,7 +210,7 @@ function video_widget_element_settings(&$element, &$form_state) {
         '#type' => 'checkbox',
         '#title' => t('Use the default thumbnail for this video?'),
         '#default_value' => $default_thumb,
-        '#description' => t('This will set a flag for this video to use the default video thumbnail when outputed..'),
+        '#description' => t('This will set a flag for this video to use the default video thumbnail when output.'),
         '#attributes' => array('class' => array('video-use-default-video-thumb')),
       );
       if ($default_thumb) {
@@ -400,7 +400,7 @@ function video_default_instance_settings($widget) {
     '#title' => t('Output video dimensions'),
     '#default_value' => !empty($widget['default_dimensions']) ? $widget['default_dimensions'] : '',
     '#options' => video_explode("\n", variable_get("video_metadata_dimensions", video_default_dimensions())),
-    '#description' => t('This settings can be overridden when node edit or preset settings. You can select most suitable values to output dimensions when node edit and selecting a wrong value may cause failure of the video conversion.'),
+    '#description' => t('This setting can be overridden in node edit or preset settings. Select the most suitable values to use as output dimensions, as selecting a bad value could cause video conversion to fail.'),
     '#weight' => 16,
   );
   return $form;
@@ -417,7 +417,7 @@ function video_default_field_settings($settings) {
   $form['autoconversion'] = array(
     '#type' => 'checkbox',
     '#title' => t('<b>Enable auto video conversion.</b>'),
-    '#description' => t('Convert videos automatically using FFmpeg or Zencoder. You can define videos presets at !preset to automatically convert videos to web compatible formats eg. FLV, MP4. Please make sure to configure your !settings to make this work properly.', array(
+    '#description' => t('Convert videos automatically using FFmpeg or Zencoder. You can define presets at !preset to automatically convert videos to web compatible formats eg. FLV, MP4. Make sure to configure your !settings to make this work properly.', array(
       '!settings' => l(t('transcoder settings'), 'admin/config/media/video/transcoders'),
       '!preset' => l(t('preset settings'), 'admin/config/media/video/presets'),
     )),
@@ -445,7 +445,7 @@ function video_default_field_settings($settings) {
     '#title' => t('Default video thumbnail'),
     '#type' => 'managed_file',
     '#element_validate' => array('video_field_default_thumbnail_validate'),
-    '#description' => t('You can use a default thumbnail for all videos or some videos which are failed to extract thumbnail from the video. Settings to use default video thumbnails will be available on node edit (You can change the permissions for other users too).'),
+    '#description' => t('You can use a default thumbnail for all videos or videos from which a thumbnail can\'t be extracted. Settings to use default video thumbnails will be available on node edit (You can change the permissions for other users too).'),
     '#default_value' => !empty($settings['default_video_thumbnail']['fid']) ? $settings['default_video_thumbnail']['fid'] : '',
     '#upload_location' => 'public://videos/thumbnails/default',
     '#weight' => 19,
@@ -456,7 +456,7 @@ function video_default_field_settings($settings) {
     '#options' => image_style_options(FALSE),
     '#empty_option' => '<' . t('no preview') . '>',
     '#default_value' => !empty($settings['preview_video_thumb_style']) ? $settings['preview_video_thumb_style'] : '',
-    '#description' => t('This image styles will be use to show extracted video thumbnails on video node edit. Extracted thumbnail preview will also use this style too.'),
+    '#description' => t('This image style will be used to show extracted video thumbnails on video node edit. Extracted thumbnail preview will also use this style.'),
     '#weight' => 20,
   );
   return $form;
diff --git a/views/video.views.inc b/views/video.views.inc
index 0ed8372..85af2be 100644
--- a/views/video.views.inc
+++ b/views/video.views.inc
@@ -80,7 +80,7 @@ function video_views_data() {
   // started
   $data['video_queue']['started'] = array(
     'title' => t('Video conversion start'),
-    'help' => t('The time of conversion process has been started.'),
+    'help' => t('The time that conversion process started.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
       'click sortable' => TRUE,
@@ -96,7 +96,7 @@ function video_views_data() {
   // completed
   $data['video_queue']['completed'] = array(
     'title' => t('Video conversion end'),
-    'help' => t('The time of conversion process has been complete.'),
+    'help' => t('The time that the conversion process completed.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
       'click sortable' => TRUE,