modal fixes! lots of good stuff...