Attaching patch with fixes and grammar. Please review.