Adding alerts and other fixes...?