Fixed typos, and calculations