Moved more variables into header file.