Typos fixed; now tested