figuring out modals
fixed conflict
fixed ridiculous bug in modals