fixes and gui elements