mainly typos, missing checks