more modal improvements