fixes + set up modal