WIP #4: typos, should have checked