Cleaned up source code, exhaustive testing of GUI