third update, various changes, including modals