Apparently they are meant to have 50 words by the time they are two (though this info is from my speech pathologist when I was a kid), so based on that, your DS sounds fine!

P is 18 months and while she has more words than the average child her age, she does that babbly thing a LOT. She knows what she's saying...but no one else does :-P