misc improvements

 * Rename some variables to a more easy-to-understand name
 * Improve some strings and fix typos
fixed renaming of variable acc. to upstream