Major bug fix and added push notification.