Development

Merge tidied up alerts into master.