fixing constants, updating variable and filenames