Fixed: various typos, missing implementation.