moved more variables to data.lua