quite a lot of corrections to div special cases