Fixes some typos and refactored list.