add some filetype mappings to the tutorial files, clean up some variable declarations