add Push Notification and Bug fix.