Fix typo
Fix NaN error
Refine notifications