A few fixes so Mehran got happy!!
typo fix