corrections, add gui elements