Supplements that promote more restful sleep?

Not really looking for supplements such as melatonin or valerian to help you become sleepy at night, or make you sleep longer. I'm trying to find things that will improve the quality of sleep so that you have more energy or wake up earlier. I've also read that if you go straight into deep sleep and don't get enough REM sleep it can cause problems, so maybe taking melatonin and things every night is not such a good idea if you pass out too quickly.

If im not mistaken, you arent supposed to take melatonin for more than 2-3 weeks at a time.

Im not sure about any other supplements but something that should be mentioned is a pitch black room with nothing electrical plugged in remotely close to where you sleep.

After taking very cold baths a few months ago, I slept like a baby. Could try that, not too sure of any supplements.

http://www.iherb.com/Jarrow-Formulas-Seditol-Assists-Relaxation-and-Rest-365-mg-30-Capsules/4294?at=0

http://www.immortalhair.org/apps/blog/show/2021994-insomnia-insanity