Fixed typos and includes