Add support Notification Numbers

also cleanup in some places
Note: you will facing bug with this that always report 6 messages only for 1 messaged (i test with WA, dunno others xD)