Port from API v2 to v3 & fixed some typo'd funcs