Add alert and minor adjustments