Fixing typos, updating API