Added Special notifications

Plus other tidying.