Made all functions more type-specific/general
Typo