moved more variables to settings file