For waking up, a glass of water straight away, helps me A LOT to get rid of grogginess, even if I've had bad sleep.
Andrew Huberman on Youtube, talks about how to improve sleep quality/timing via early sunlight exposure/limiting light exposure at night.