Made some minor name changes in the GUI and changed all class variables to local.