FIX: some typos and formatting