Problem modal and more improvements.