merge fixes and better modal plus other small things