Forgot some and some typos