FIX and typos