4,1

-fixed name of variable
-fixed names of files
-fixed includes