- Updated GUI to use the correct values.
- Temp fix for memory leak when closing program