some modal improvements