I have added missing definitions and fixed one