improve messages and alerts