FIX typos and minor issues