FIX: fixed some generic typos