Alex - Push notifications

and other fixes