modal + fixes