modal and fixes