Add logging, and fix bug on calculating fire notification time