additional error checking
better notification scheduling