changed variable names and file names to match new variables
-tweaked menu settings