user_alert patch added
cleaned up a bit