modal + other fixes