Make modal work, general edits