I took two Melatonin tablets. Strangely enough the caffine did not bother me at all. I don't drink coffee, tea or pop and was surprised by this.
I know what you mean by the olive oil. I can hardly stand it, but it works so well, I just get it down as quickly as possible, lie down and pop a piece of peppermint in my mouth.