Working on modals logic & some other tweaks