Bug Fixes and Push notifications

Bug Fixes and Push notifications