extended modals
minor fixes