iCloud Photo Library

Recently started using iCloud Photo Library and having trouble with 2 things:

1- while my iPhone photos contains the same photos as iCloud my MacBook air is missing more recent photos even though I've been on WiFi, etc for at least 24 hours.

2- want to edit a photo on my MacBook and it is the lower quality photo so when I try to select the photo it displays the triangular shape with the "?". Tried downloading the photo from iCloud but it doesn't appear in my downloads nor does the higher quality photo show up on Photos.

Anyone having either of these issues?