Jonah as a Type of Christ

As I was reading Jonah last night, it struck me that both Jonah and Christ were found sleeping through pretty bad storms and woken by annoyed shipmates before the storm was calmed by God's power. Now I know Jonah's three days in the fish correlate to the Messiah's three days in the grave, but I'd never paid attention to these further similarites, though they now seem rather obvious.