Bug fixes, push notification structure updates (not tested yet)