Added include files, fixed typos