changed modal and misc