I’d say yes to both. If you give them a bit more time, more calyxs will swell and increase your harvest weight.
Your best bet for finding the right harvest window will be zooming in on the trichomes- and looking ‘milky’ colored crystals. So people like to wait a bit longer for more amber colored crystals to appear 🌱