Type additions, typo fix