fixes #248 - Finished alert refactoring successfully
probably also resolves issues #247 and #240